Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)
commitd9d12493664dc95bfa9f749aabc077cc2f6d2eab
treea8e9ee5a4e629288e8b67816c7867166b3da8601
parent55383b407f9c7e8ff73e428e195db2f6f44107cf
parent407d77a8f80bc010a4181299f6ef97c9b56cb7cb
Merge from trunk.